Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fixing the range of remove merged selection and filter empty ranges #1680

Merged
merged 1 commit into from
Mar 25, 2024
Merged

fix: fixing the range of remove merged selection and filter empty ranges #1680

merged 1 commit into from
Mar 25, 2024

Conversation

ybzky
Copy link
Member

@ybzky ybzky commented Mar 25, 2024 •
edited by hexf00
Loading

  1. remove的时候直接remove正确的合并单元格 而不是remove选区
  2. add/remove merge选区为空的时候过滤该mutation的发送

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 25, 2024 •
edited
Loading

View Deployment

📑 Examples 📚 Storybook
🔗 Preview link 🔗 Preview link

@codecov Codecov
Copy link

codecov bot commented Mar 25, 2024

Codecov Report

Attention: Patch coverage is 63.63636% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 32.80%. Comparing base (7afaff0) to head (074f9dc).
Report is 2 commits behind head on dev.

Files Patch % Lines
...c/commands/commands/add-worksheet-merge.command.ts 60.00% 2 Missing ⚠️
...ommands/commands/remove-worksheet-merge.command.ts 0.00% 2 Missing ⚠️
Additional details and impacted files 
@@           Coverage Diff           @@
##              dev    #1680   +/-   ##
=======================================
  Coverage   32.80%   32.80%           
=======================================
  Files         952      952           
  Lines       53390    53394    +4     
  Branches    11145    11149    +4     
=======================================
+ Hits        17513    17515    +2     
- Misses      35877    35879    +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@univer-bot
Copy link

univer-bot bot commented Mar 25, 2024

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Origin Title: fix: fixing the range of remove merged selection and filter empty ranges

Title: fix: fixing the range of remove merged selection and filter empty ranges

  1. When removing, directly remove the correct merged cells instead of removing the selection.
  2. Filter the sending of the mutation when the add/remove merge selection is empty.

@ybzky ybzky merged commit 117cbbe into dev Mar 25, 2024
9 checks passed
@jikkai jikkai deleted the fix-empty-remove-merge branch May 18, 2024 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gggpound Gggpound Gggpound approved these changes

@yuhongz yuhongz Awaiting requested review from yuhongz yuhongz is a code owner

@jikkai jikkai Awaiting requested review from jikkai jikkai is a code owner

@wzhudev wzhudev Awaiting requested review from wzhudev wzhudev is a code owner

@DR-Univer DR-Univer Awaiting requested review from DR-Univer

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ybzky @Gggpound